Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Sat, 10 Jun 2017 13:48:09 +0000 (09:48 -0400)
committerTom Rini <[email protected]>
Sat, 10 Jun 2017 13:48:09 +0000 (09:48 -0400)

Trivial merge